From: Jan D <jan.h.d@swipnet.se>
Date: Fri, 3 Apr 2015 12:24:44 +0000 (+0200)
Subject: Tool tips for menus did not show any text.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~23^2~2819^2~11
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=5558a14438172634e8802cbaa87abc265e5d7a4c;p=emacs.git

Tool tips for menus did not show any text.

* src/xterm.c (x_update_begin): Don't create any surface for non-visible
tip frames, the geometry may be wrong.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index e41da251ec6..f7941e04280 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -2,6 +2,8 @@
 
 	* xterm.c (handle_one_xevent): Always redraw tool tips on
 	MapNotify.  Update tool tip frame sizes on ConfigureNotify.
+	(x_update_begin): Don't create any surface for non-visible
+	tip frames, the geometry may be wrong.
 
 2015-03-31  Eli Zaretskii  <eliz@gnu.org>
 
diff --git a/src/xterm.c b/src/xterm.c
index 6bd09300c34..f1632f3141d 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -1038,6 +1038,10 @@ static void
 x_update_begin (struct frame *f)
 {
 #ifdef USE_CAIRO
+  if (! NILP (tip_frame) && XFRAME (tip_frame) == f
+      && ! FRAME_VISIBLE_P (f))
+    return;
+
   if (! FRAME_CR_SURFACE (f))
     {
       int width, height;